Check for mallinfo.

2004-09-21  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Check for mallinfo.

	* tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO
	is defined.  (#153168, Darren Creutz)

diff --git a/ChangeLog b/ChangeLog
index 88cf40aeac34b9ad4d5a7d9f23a0c50785b1d4ec..948d7450fe40db992982caa4c3ac68049da6c17f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for mallinfo.
+
+       * tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO
+       is defined.  (#153168, Darren Creutz)
+
        * gtk/gtkactiongroup.c: Fix typos in signal docs.  (#153224,
        John Finlay)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 88cf40aeac34b9ad4d5a7d9f23a0c50785b1d4ec..948d7450fe40db992982caa4c3ac68049da6c17f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for mallinfo.
+
+       * tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO
+       is defined.  (#153168, Darren Creutz)
+
        * gtk/gtkactiongroup.c: Fix typos in signal docs.  (#153224,
        John Finlay)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 88cf40aeac34b9ad4d5a7d9f23a0c50785b1d4ec..948d7450fe40db992982caa4c3ac68049da6c17f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for mallinfo.
+
+       * tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO
+       is defined.  (#153168, Darren Creutz)
+
        * gtk/gtkactiongroup.c: Fix typos in signal docs.  (#153224,
        John Finlay)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 88cf40aeac34b9ad4d5a7d9f23a0c50785b1d4ec..948d7450fe40db992982caa4c3ac68049da6c17f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for mallinfo.
+
+       * tests/testtreemodel.c: Only include malloc.h if HAVE_MALLINFO
+       is defined.  (#153168, Darren Creutz)
+
        * gtk/gtkactiongroup.c: Fix typos in signal docs.  (#153224,
        John Finlay)
 

diff --git a/configure.in b/configure.in
index 73766aec78a776645f7b62e9033efd5e91c4943c..21ceb73ff445245a942a8ff8fc23cd36054d0379 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -571,6 +571,7 @@ AC_C_CONST
 AC_TYPE_SIGNAL
 AC_FUNC_MMAP
 
+AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_FUNCS(getresuid)
 AC_TYPE_UID_T
 

diff --git a/tests/testtreemodel.c b/tests/testtreemodel.c
index fd01d70987f7c04a9acc6898a759cdb398f79020..56b986b3f9dbec0af8b3a12bcd22740d345f6ff2 100644 (file)
--- a/tests/testtreemodel.c
+++ b/tests/testtreemodel.c
@@ -1,4 +1,25 @@
+/* testtreemodel.c
+ * Copyright (C) 2004  Red Hat, Inc.,  Matthias Clasen <mclasen@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_MALLINFO
 #include <malloc.h>
+#endif
 #include <gtk/gtk.h>
 
 static gint repeats = 2;